Change library name (and download location) from GTK+ to GTK, following upstream...

diff --git a/debian/changelog b/debian/changelog
index 3ec4af45211e117b7f37b6afa8321d15bec46730..e45898a027eb7235761b819f9f5e51bf36e01fdf 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,7 +16,7 @@ gtk+4.0 (3.94.0-1) UNRELEASED; urgency=medium
     - d/copyright: Update
     - d/patches: Delete patches that aren't applied
     - d/p/gdk-x11-Check-if-we-have-access-to-GL-before-using-G.patch:
-      Drop, obsoleted by commit 02eb344 in GTK+ 3.93
+      Drop, obsoleted by commit 02eb344 in GTK 3.93
     - d/p/no-accessibility-dump.patch: Drop, no longer needed.
       The build-time tests correctly set GTK_CSD=1 now.
     - Disable GStreamer video support for now
@@ -25,7 +25,7 @@ gtk+4.0 (3.94.0-1) UNRELEASED; urgency=medium
       no longer available (the multipress IM module is unmaintained and
       was removed)
     - d/libgtk-4-0.install.in: Don't install IM modules. The backend IM
-      modules such as XIM and Wayland are now linked into GTK+ itself,
+      modules such as XIM and Wayland are now linked into GTK itself,
       while non-backend IM modules have been removed.
     - d/rules: Update Meson options, mostly removing enable- prefix
     - d/libgtk-4-0.symbols: Update
@@ -34,7 +34,7 @@ gtk+4.0 (3.94.0-1) UNRELEASED; urgency=medium
   * Generate a dependency on a virtual package that reflects the unstable
     SONAME, currently libgtk-4-0.9400.0, and Provide that virtual package
     from libgtk-4-0. This avoids repeated package renames while the ABI
-    of GTK+ 4 remains unstable.
+    of GTK 4 remains unstable.
   * gir1.2-gtk-4.0: Add Provides for gir1.2-gdk-4.0, gir1.2-gdkx11-4.0
     and gir1.2-gsk-4.0 to reflect its contents
   * d/libgtk-4-0.postinst.in: Run gio-querymodules for IM modules
@@ -42,7 +42,7 @@ gtk+4.0 (3.94.0-1) UNRELEASED; urgency=medium
   * libgtk-4-dev: Add missing dependency on libvulkan-dev (thanks,
     autopkgtest) (Closes: #910640)
   * libgtk-4-0.postrm.in: Remove the correct cache files
-  * Drop support for OLD_MODULES_BASE_PATH. GTK+ 4 has never supported
+  * Drop support for OLD_MODULES_BASE_PATH. GTK 4 has never supported
     modules in the non-multiarch location.
   * Run tests under Xvfb with GLX available (see #874077)
   * Build installed-tests and run them as autopkgtests (similar to #908440)
@@ -54,10 +54,10 @@ gtk+4.0 (3.94.0-1) UNRELEASED; urgency=medium
       Add patches (already in upstream git) to fix some tests
   * d/tests/control: Mark python3-gi as flaky until python3-gi overrides
     get updated for the rename of Gdk.Window to Gdk.Surface
-  * d/tests/build: Update for GTK+ 4.0
+  * d/tests/build: Update for GTK 4.0
   * Canonicalize permissions of debian/rules
   * Normalize various packaging files with wrap-and-sort -a
-  * Remove obsolete debian/*.install files from GTK+ 3
+  * Remove obsolete debian/*.install files from GTK 3
   * List installed but unpackaged files in d/not-installed
   * d/rules: Defang dh_auto_test when built with nocheck
   * Stop using Priority: extra
@@ -72,6 +72,8 @@ gtk+4.0 (3.94.0-1) UNRELEASED; urgency=medium
   * Remove autoconf-archive B-D
   * Don't build udebs if built with noudeb build-profile
   * Add test-dependency on xvfb so we can run the built program
+  * Change library name (and download location) from GTK+ to GTK,
+    following upstream re-branding
 
   [ Laurent Bigonville ]
   * Add Closes statement for #910640

diff --git a/debian/control b/debian/control
index ca781436c3abc079fe20c31c1b11f6b7dffa36d0..4517e626a4d5671106ab96f8fcfb3427a372dbed 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -76,9 +76,9 @@ Suggests: gvfs,
 Breaks: gnome-themes-standard (<< 3.6),
         gtk3-engines-oxygen (<< 1.4.1-3)
 Pre-Depends: ${misc:Pre-Depends}
-Description: GTK+ graphical user interface library
- GTK+ is a multi-platform toolkit for creating graphical user
- interfaces. Offering a complete set of widgets, GTK+ is suitable
+Description: GTK graphical user interface library
+ GTK is a multi-platform toolkit for creating graphical user
+ interfaces. Offering a complete set of widgets, GTK is suitable
  for projects ranging from small one-off tools to complete application
  suites.
  .
@@ -92,11 +92,11 @@ Architecture: any
 Depends: ${misc:Depends},
          ${shlibs:Depends}
 Provides: gtk4-binver-4.0.0, libgtk-4-0.9400.0
-Description: GTK+ graphical user interface library - minimal runtime
+Description: GTK graphical user interface library - minimal runtime
  This is a udeb, or a microdeb, for the debian-installer.
  .
- GTK+ is a multi-platform toolkit for creating graphical user
- interfaces. Offering a complete set of widgets, GTK+ is suitable
+ GTK is a multi-platform toolkit for creating graphical user
+ interfaces. Offering a complete set of widgets, GTK is suitable
  for projects ranging from small one-off tools to complete application
  suites.
  .
@@ -110,9 +110,9 @@ Multi-Arch: foreign
 Depends: libgtk-3-common,
          ${misc:Depends}
 Recommends: libgtk-4-0
-Description: common files for the GTK+ graphical user interface library
- GTK+ is a multi-platform toolkit for creating graphical user
- interfaces. Offering a complete set of widgets, GTK+ is suitable
+Description: common files for the GTK graphical user interface library
+ GTK is a multi-platform toolkit for creating graphical user
+ interfaces. Offering a complete set of widgets, GTK is suitable
  for projects ranging from small one-off tools to complete application
  suites.
  .
@@ -128,9 +128,9 @@ Depends: gtk-update-icon-cache,
          ${shlibs:Depends},
          libgtk-4-common (>= ${source:Version}),
          libgtk-4-0 (>= ${source:Version})
-Description: programs for the GTK+ graphical user interface library
- GTK+ is a multi-platform toolkit for creating graphical user
- interfaces. Offering a complete set of widgets, GTK+ is suitable
+Description: programs for the GTK graphical user interface library
+ GTK is a multi-platform toolkit for creating graphical user
+ interfaces. Offering a complete set of widgets, GTK is suitable
  for projects ranging from small one-off tools to complete application
  suites.
  .
@@ -171,14 +171,14 @@ Depends: gir1.2-gtk-4.0 (= ${binary:Version}),
          libgtk-4-common,
          libgtk-4-0 (= ${binary:Version})
 Suggests: libgtk-4-doc
-Description: development files for the GTK+ library
- GTK+ is a multi-platform toolkit for creating graphical user
- interfaces. Offering a complete set of widgets, GTK+ is suitable
+Description: development files for the GTK library
+ GTK is a multi-platform toolkit for creating graphical user
+ interfaces. Offering a complete set of widgets, GTK is suitable
  for projects ranging from small one-off tools to complete application
  suites.
  .
  This package contains the header and development files which are
- needed for building GTK+ applications.
+ needed for building GTK applications.
 
 Package: libgtk-4-doc
 Section: doc
@@ -189,13 +189,13 @@ Recommends: libatk1.0-doc,
             libglib2.0-doc,
             libpango1.0-doc
 Suggests: devhelp
-Description: documentation for the GTK+ graphical user interface library
- GTK+ is a multi-platform toolkit for creating graphical user
- interfaces. Offering a complete set of widgets, GTK+ is suitable
+Description: documentation for the GTK graphical user interface library
+ GTK is a multi-platform toolkit for creating graphical user
+ interfaces. Offering a complete set of widgets, GTK is suitable
  for projects ranging from small one-off tools to complete application
  suites.
  .
- This package contains the HTML documentation for the GTK+ library
+ This package contains the HTML documentation for the GTK library
  in /usr/share/doc/libgtk-4-doc/ .
 
 Package: gtk-4-examples
@@ -205,14 +205,14 @@ Depends: gtk-3-examples,
          ${misc:Depends},
          ${shlibs:Depends},
          libgtk-4-0 (= ${binary:Version})
-Description: example files for GTK+ 4
- GTK+ is a multi-platform toolkit for creating graphical user
- interfaces. Offering a complete set of widgets, GTK+ is suitable
+Description: example files for GTK 4
+ GTK is a multi-platform toolkit for creating graphical user
+ interfaces. Offering a complete set of widgets, GTK is suitable
  for projects ranging from small one-off tools to complete application
  suites.
  .
  This package contains the example files and a demonstration program
- for GTK+4. It also contains the installed tests.
+ for GTK4. It also contains the installed tests.
 
 Package: gir1.2-gtk-4.0
 Section: introspection
@@ -227,9 +227,9 @@ Breaks: python-gi (<< 3.18),
 Provides: gir1.2-gdk-4.0 (= ${binary:Version}),
           gir1.2-gdkx11-4.0 (= ${binary:Version}),
           gir1.2-gsk-4.0 (= ${binary:Version})
-Description: GTK+ graphical user interface library -- gir bindings
- GTK+ is a multi-platform toolkit for creating graphical user
- interfaces. Offering a complete set of widgets, GTK+ is suitable
+Description: GTK graphical user interface library -- gir bindings
+ GTK is a multi-platform toolkit for creating graphical user
+ interfaces. Offering a complete set of widgets, GTK is suitable
  for projects ranging from small one-off tools to complete application
  suites.
  .
@@ -249,7 +249,7 @@ Description: GTK+ graphical user interface library -- gir bindings
 #Description: icon theme caching utility
 # gtk-update-icon-cache creates mmap()able cache files for icon themes.
 # .
-# GTK+ can use the cache files created by gtk-update-icon-cache to avoid a lot
+# GTK can use the cache files created by gtk-update-icon-cache to avoid a lot
 # of system call and disk seek overhead when the application starts. Since the
 # format of the cache files allows them to be mmap()ed shared between multiple
 # applications, the overall memory consumption is reduced as well.

diff --git a/debian/control.in b/debian/control.in
index 73fb8a36779b8c53afe85255b23492750d886d67..be016435eb928a744bc12424ee8f2a70abdc4886 100644 (file)
--- a/debian/control.in
+++ b/debian/control.in
@@ -76,9 +76,9 @@ Suggests: gvfs,
 Breaks: gnome-themes-standard (<< 3.6),
         gtk3-engines-oxygen (<< 1.4.1-3)
 Pre-Depends: ${misc:Pre-Depends}
-Description: GTK+ graphical user interface library
- GTK+ is a multi-platform toolkit for creating graphical user
- interfaces. Offering a complete set of widgets, GTK+ is suitable
+Description: GTK graphical user interface library
+ GTK is a multi-platform toolkit for creating graphical user
+ interfaces. Offering a complete set of widgets, GTK is suitable
  for projects ranging from small one-off tools to complete application
  suites.
  .
@@ -92,11 +92,11 @@ Architecture: any
 Depends: ${misc:Depends},
          ${shlibs:Depends}
 Provides: @GTK_BINVER_DEP@
-Description: GTK+ graphical user interface library - minimal runtime
+Description: GTK graphical user interface library - minimal runtime
  This is a udeb, or a microdeb, for the debian-installer.
  .
- GTK+ is a multi-platform toolkit for creating graphical user
- interfaces. Offering a complete set of widgets, GTK+ is suitable
+ GTK is a multi-platform toolkit for creating graphical user
+ interfaces. Offering a complete set of widgets, GTK is suitable
  for projects ranging from small one-off tools to complete application
  suites.
  .
@@ -110,9 +110,9 @@ Multi-Arch: foreign
 Depends: libgtk-3-common,
          ${misc:Depends}
 Recommends: @SHARED_PKG@
-Description: common files for the GTK+ graphical user interface library
- GTK+ is a multi-platform toolkit for creating graphical user
- interfaces. Offering a complete set of widgets, GTK+ is suitable
+Description: common files for the GTK graphical user interface library
+ GTK is a multi-platform toolkit for creating graphical user
+ interfaces. Offering a complete set of widgets, GTK is suitable
  for projects ranging from small one-off tools to complete application
  suites.
  .
@@ -128,9 +128,9 @@ Depends: gtk-update-icon-cache,
          ${shlibs:Depends},
          @COMMON_PKG@ (>= ${source:Version}),
          @SHARED_PKG@ (>= ${source:Version})
-Description: programs for the GTK+ graphical user interface library
- GTK+ is a multi-platform toolkit for creating graphical user
- interfaces. Offering a complete set of widgets, GTK+ is suitable
+Description: programs for the GTK graphical user interface library
+ GTK is a multi-platform toolkit for creating graphical user
+ interfaces. Offering a complete set of widgets, GTK is suitable
  for projects ranging from small one-off tools to complete application
  suites.
  .
@@ -171,14 +171,14 @@ Depends: gir1.2-gtk-4.0 (= ${binary:Version}),
          @COMMON_PKG@,
          @SHARED_PKG@ (= ${binary:Version})
 Suggests: @DOC_PKG@
-Description: development files for the GTK+ library
- GTK+ is a multi-platform toolkit for creating graphical user
- interfaces. Offering a complete set of widgets, GTK+ is suitable
+Description: development files for the GTK library
+ GTK is a multi-platform toolkit for creating graphical user
+ interfaces. Offering a complete set of widgets, GTK is suitable
  for projects ranging from small one-off tools to complete application
  suites.
  .
  This package contains the header and development files which are
- needed for building GTK+ applications.
+ needed for building GTK applications.
 
 Package: @DOC_PKG@
 Section: doc
@@ -189,13 +189,13 @@ Recommends: libatk1.0-doc,
             libglib2.0-doc,
             libpango1.0-doc
 Suggests: devhelp
-Description: documentation for the GTK+ graphical user interface library
- GTK+ is a multi-platform toolkit for creating graphical user
- interfaces. Offering a complete set of widgets, GTK+ is suitable
+Description: documentation for the GTK graphical user interface library
+ GTK is a multi-platform toolkit for creating graphical user
+ interfaces. Offering a complete set of widgets, GTK is suitable
  for projects ranging from small one-off tools to complete application
  suites.
  .
- This package contains the HTML documentation for the GTK+ library
+ This package contains the HTML documentation for the GTK library
  in /usr/share/doc/@DOC_PKG@/ .
 
 Package: @EXAMPLES_PKG@
@@ -205,14 +205,14 @@ Depends: gtk-3-examples,
          ${misc:Depends},
          ${shlibs:Depends},
          @SHARED_PKG@ (= ${binary:Version})
-Description: example files for GTK+ 4
- GTK+ is a multi-platform toolkit for creating graphical user
- interfaces. Offering a complete set of widgets, GTK+ is suitable
+Description: example files for GTK 4
+ GTK is a multi-platform toolkit for creating graphical user
+ interfaces. Offering a complete set of widgets, GTK is suitable
  for projects ranging from small one-off tools to complete application
  suites.
  .
  This package contains the example files and a demonstration program
- for GTK+4. It also contains the installed tests.
+ for GTK4. It also contains the installed tests.
 
 Package: gir1.2-gtk-4.0
 Section: introspection
@@ -227,9 +227,9 @@ Breaks: python-gi (<< 3.18),
 Provides: gir1.2-gdk-4.0 (= ${binary:Version}),
           gir1.2-gdkx11-4.0 (= ${binary:Version}),
           gir1.2-gsk-4.0 (= ${binary:Version})
-Description: GTK+ graphical user interface library -- gir bindings
- GTK+ is a multi-platform toolkit for creating graphical user
- interfaces. Offering a complete set of widgets, GTK+ is suitable
+Description: GTK graphical user interface library -- gir bindings
+ GTK is a multi-platform toolkit for creating graphical user
+ interfaces. Offering a complete set of widgets, GTK is suitable
  for projects ranging from small one-off tools to complete application
  suites.
  .
@@ -249,7 +249,7 @@ Description: GTK+ graphical user interface library -- gir bindings
 #Description: icon theme caching utility
 # gtk-update-icon-cache creates mmap()able cache files for icon themes.
 # .
-# GTK+ can use the cache files created by gtk-update-icon-cache to avoid a lot
+# GTK can use the cache files created by gtk-update-icon-cache to avoid a lot
 # of system call and disk seek overhead when the application starts. Since the
 # format of the cache files allows them to be mmap()ed shared between multiple
 # applications, the overall memory consumption is reduced as well.

diff --git a/debian/copyright b/debian/copyright
index e07342625dada6fb62aa1259f85fb545984c590c..b518528c440448b068db6168a22152cec0e0d2ce 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,6 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: gtk+
-Source: https://download.gnome.org/sources/gtk+/
+Upstream-Name: GTK
+Source: https://download.gnome.org/sources/gtk/
 License: LGPL-2.1+
 
 Files: *

diff --git a/debian/libgtk-4-doc.doc-base.gdk.in b/debian/libgtk-4-doc.doc-base.gdk.in
index 938d5f8337eb57bf84df5755df09fa334d143fbd..47a647053ed07ada61f10cf0b9342fe0774d6428 100644 (file)
--- a/debian/libgtk-4-doc.doc-base.gdk.in
+++ b/debian/libgtk-4-doc.doc-base.gdk.in
@@ -3,7 +3,7 @@ Title: GDK Reference Manual
 Author: Damon Chaplin et al.
 Abstract: The GDK library provides an OS-independant wrapper around the
  most fundamental graphical user interface functions.  This allows
- GTK+ to be ported to non-X11 systems, as long as GDK is ported first.
+ GTK to be ported to non-X11 systems, as long as GDK is ported first.
  .
  This document covers programming in GDK.
 Section: Programming/C

diff --git a/debian/libgtk-4-doc.doc-base.gsk.in b/debian/libgtk-4-doc.doc-base.gsk.in
index 2c1290b9e22f4b2557445270e79f19038e44fd3b..cb20dcecf15a7c194d22c65fc9b8258164fa405c 100644 (file)
--- a/debian/libgtk-4-doc.doc-base.gsk.in
+++ b/debian/libgtk-4-doc.doc-base.gsk.in
@@ -1,7 +1,7 @@
 Document: gsk4
 Title: GSK Reference Manual
 Author: Damon Chaplin et al.
-Abstract: The GTK+ library provides a graphical user interface for
+Abstract: The GTK library provides a graphical user interface for
  C programs, and is used in projects such as GIMP, GNOME, and Mozilla.
  .
  This document covers programming in GSK.

diff --git a/debian/libgtk-4-doc.doc-base.gtk.in b/debian/libgtk-4-doc.doc-base.gtk.in
index c315790df5c24ab5885d2c64cc5fb5080dffb5f2..555c01a1f402184a3199234c13e0b71d361a96a7 100644 (file)
--- a/debian/libgtk-4-doc.doc-base.gtk.in
+++ b/debian/libgtk-4-doc.doc-base.gtk.in
@@ -1,9 +1,9 @@
 Document: gtk4
-Title: GTK+ Reference Manual
+Title: GTK Reference Manual
 Author: Damon Chaplin et al.
-Abstract: The GTK+ library provides a graphical user interface for
+Abstract: The GTK library provides a graphical user interface for
  C programs, and is used in projects such as GIMP, GNOME, and Mozilla.
- This document covers programming using the GTK+ library.
+ This document covers programming using the GTK library.
 Section: Programming/C
 
 Format: HTML

diff --git a/debian/tests/build b/debian/tests/build
index cd7725b405243fc5e9394c8699f86aa5bf4682b0..c34c06caec657819c1878ffc02342a8ba3d9aff7 100755 (executable)
--- a/debian/tests/build
+++ b/debian/tests/build
@@ -2,7 +2,7 @@
 # autopkgtest check: Build and run a program against GTK, to verify that the
 # headers and pkg-config file are installed correctly
 # Based on examples/hello-world.c:
-# (C) 1997-2015 GTK+ contributors (see debian/copyright)
+# (C) 1997-2015 GTK contributors (see debian/copyright)
 # and on an older autopkgtest:
 # (C) 2012 Canonical Ltd.
 # Author: Martin Pitt <martin.pitt@ubuntu.com>

diff --git a/debian/tests/installed-tests b/debian/tests/installed-tests
index c6aa30bbdf7fdb72a8a4535c50074cb21b89330e..4349fa049f086dd25691bb5b3bcae9988a2ad988 100755 (executable)
--- a/debian/tests/installed-tests
+++ b/debian/tests/installed-tests
@@ -1,5 +1,5 @@
 #!/bin/sh
-# autopkgtest check: Run the installed-tests to verify GTK+ works correctly
+# autopkgtest check: Run the installed-tests to verify GTK works correctly
 # Based on glib2.0's d/tests/installed-tests, (C) 2013 Canonical Ltd.
 
 set -e

diff --git a/debian/watch b/debian/watch
index 922f14624d6a8ef8ded44946e0a50ba5e6f40903..b8010e0215d446ae647d11ac62748f8080a7e1d8 100644 (file)
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
 version=4
-https://download.gnome.org/sources/gtk+/([\d\.]+)/ \
-       gtk\+@ANY_VERSION@\.tar\.xz
+https://download.gnome.org/sources/gtk/([\d\.]+)/ \
+       gtk-@ANY_VERSION@\.tar\.xz